From 59dca3905684f80b4396534ee3042e884f32d991 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 21 Aug 2015 14:54:13 +0100 Subject: [PATCH] Include a reportbug control file to redirect bugs to src:xen (cherry picked from commit 084b7cf56dd2ccfbf1c04796689222dac9d58ac6) Conflicts: debian/changelog debian/rules.real Signed-off-by: Ian Jackson --- debian/changelog | 2 ++ debian/rules.real | 6 +++++- debian/templates/libxen.bug/control | 1 + debian/templates/xen-hypervisor.bug/control | 1 + debian/templates/xen-utils.bug/control | 1 + 5 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 debian/templates/libxen.bug/control create mode 100644 debian/templates/xen-hypervisor.bug/control create mode 100644 debian/templates/xen-utils.bug/control diff --git a/debian/changelog b/debian/changelog index 9d0a912005..3060622f17 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,8 @@ xen (4.8.0-1~) unstable; urgency=high (Closes: #763102) * Apply SELinux labels to directories created by initscripts. Patch from Russell Coker. (Closes: #764912) + * Include a reportbug control file to redirect bugs to src:xen for + packages which contain the Xen version in the name. Closes:#796370. [ Lubomir Host ] * Fix xen-init-name to not fail looking for a nonexistent 'config' diff --git a/debian/rules.real b/debian/rules.real index bda089232b..1ed72005b2 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -163,6 +163,7 @@ install-hypervisor_$(ARCH)_$(FLAVOUR): $(STAMPS_DIR)/build-hypervisor_$(ARCH)_$( dh_installdirs etc/default/grub.d install -D -m644 debian/xen-hypervisor-$(VERSION).xen.cfg \ debian/$(PACKAGE_NAME)/etc/default/grub.d/xen.cfg + dh_install debian/templates/xen-hypervisor.bug/* usr/share/bug/$(PACKAGE_NAME) cp $(DIR)/xen/xen$(IMAGE_SUFFIX) debian/$(PACKAGE_NAME)/boot/xen-$(VERSION)-$(FLAVOUR)$(IMAGE_SUFFIX) ifeq ($(ARCH),amd64) cp $(DIR)/xen/xen.efi debian/$(PACKAGE_NAME)/boot/xen-$(VERSION)-$(FLAVOUR).efi @@ -170,12 +171,14 @@ endif +$(MAKE_SELF) install-base install-libxen_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH) -install-libxen_$(ARCH): DH_OPTIONS = -plibxen-$(VERSION) +install-libxen_$(ARCH): PACKAGE_NAME = libxen-$(VERSION) +install-libxen_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME) install-libxen_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH) install-libxenstore_$(ARCH) dh_testdir dh_testroot dh_prep dh_install --sourcedir=$(DIR) usr/lib/*/lib*-$(VERSION).so* + dh_install debian/templates/libxen.bug/* usr/share/bug/$(PACKAGE_NAME) dh_strip dh_makeshlibs -V dh_shlibdeps @@ -220,6 +223,7 @@ install-utils_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH) install-libxen_$(ARCH install -D -m644 debian/xen-utils.NEWS $(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)/NEWS install -D -m644 debian/xen-utils.README.Debian $(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)/README.Debian dh_install --sourcedir=$(DIR) usr/lib/xen-$(VERSION) + dh_install debian/templates/xen-utils.bug/* usr/share/bug/$(PACKAGE_NAME) dh_lintian ( echo -n "misc:Built-Using="; dpkg-query -f='$${source:Package} (= $${source:Version}), ' -W ipxe-qemu seabios; echo ) >> debian/$(PACKAGE_NAME).substvars dh_python2 -V$(shell pyversions -rv) /usr/lib/xen-$(VERSION) diff --git a/debian/templates/libxen.bug/control b/debian/templates/libxen.bug/control new file mode 100644 index 0000000000..3e21b39c90 --- /dev/null +++ b/debian/templates/libxen.bug/control @@ -0,0 +1 @@ +Submit-As: src:xen diff --git a/debian/templates/xen-hypervisor.bug/control b/debian/templates/xen-hypervisor.bug/control new file mode 100644 index 0000000000..3e21b39c90 --- /dev/null +++ b/debian/templates/xen-hypervisor.bug/control @@ -0,0 +1 @@ +Submit-As: src:xen diff --git a/debian/templates/xen-utils.bug/control b/debian/templates/xen-utils.bug/control new file mode 100644 index 0000000000..3e21b39c90 --- /dev/null +++ b/debian/templates/xen-utils.bug/control @@ -0,0 +1 @@ +Submit-As: src:xen -- 2.30.2